better handling of .opt manpages, added missing ocamlbuild.opt manpage (symlink)

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index f9bfcfa9fc32cac9f69295ee4ed59d563c045870..d0672fcef38164e00532696fd87a940f29d5ade6 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -4,8 +4,6 @@ TODO list for ocaml 3.10.0 (and beyond ...)
 
   lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-3_i386.changes
 
-  W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.byte
-  W: ocaml-nox: binary-without-manpage usr/bin/ocamlbuild.native
   W: ocaml-nox: script-not-executable ./usr/lib/ocaml/3.10.0/camlheader
   W: ocaml-mode: binary-without-manpage usr/bin/ocamltags
   E: ocaml-compiler-libs: copyright-should-refer-to-common-license-file-for-gpl

diff --git a/debian/changelog b/debian/changelog
index 252cd421e6a573d5f5a6bbb7ec61267367f41a88..67230f08a5527453ef91c3a46faacb03afe9ef77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ ocaml (3.10.0-3) UNRELEASED; urgency=low
       get the correct libdir setting
   * debian/ocaml-md5sums/ocaml-md5sums.1
     - written ocaml-md5sums manpage
+  * debian/ocaml-native-compilers.links
+    - delegated to dh_link the creation of .opt manpage symlinks and added the
+      missing one for ocamlbuild.opt
 
  -- Stefano Zacchiroli <zack@debian.org>  Sat, 16 Jun 2007 16:03:48 +0000
 

diff --git a/debian/ocaml-native-compilers.links b/debian/ocaml-native-compilers.links
new file mode 100644 (file)
index 0000000..dccfc95
--- /dev/null
+++ b/debian/ocaml-native-compilers.links
@@ -0,0 +1,6 @@
+usr/share/man/man1/ocamlbuild.1.gz     usr/share/man/man1/ocamlbuild.opt.1.gz
+usr/share/man/man1/ocamlc.1.gz         usr/share/man/man1/ocamlc.opt.1.gz
+usr/share/man/man1/ocamldep.1.gz       usr/share/man/man1/ocamldep.opt.1.gz
+usr/share/man/man1/ocamldoc.1.gz       usr/share/man/man1/ocamldoc.opt.1.gz
+usr/share/man/man1/ocamllex.1.gz       usr/share/man/man1/ocamllex.opt.1.gz
+usr/share/man/man1/ocamlopt.1.gz       usr/share/man/man1/ocamlopt.opt.1.gz

diff --git a/debian/rules b/debian/rules
index d0dd025ec662fa5ad588806d3cbf7e2fcbe5ca1e..f4db989f67665a5e524068eddd5cac2f74a4f8cd 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -225,12 +225,6 @@ install-arch: build-arch
        rm -f debian/ocaml-nox/usr/share/man/man1/*.opt.1
 
        # Make some symbolic links
-       cd debian/ocaml-native-compilers/usr/share/man/man1; \
-               ln -sf /usr/share/man/man1/ocamlc.1.gz ocamlc.opt.1.gz; \
-               ln -sf /usr/share/man/man1/ocamlopt.1.gz ocamlopt.opt.1.gz; \
-               ln -sf /usr/share/man/man1/ocamllex.1.gz ocamllex.opt.1.gz; \
-               ln -sf /usr/share/man/man1/ocamldoc.1.gz ocamldoc.opt.1.gz; \
-               ln -sf /usr/share/man/man1/ocamldep.1.gz ocamldep.opt.1.gz
        cd debian/ocaml/usr/share/doc/ocaml; \
                ln -sf ../ocaml-base-nox/Changes.gz .; \
                ln -sf ../ocaml-base-nox/README.gz .; \